From fe682268d12e866768a3826a906f353507df6002 Mon Sep 17 00:00:00 2001 From: Robert Brady Date: Thu, 16 Nov 2000 00:41:02 +0000 Subject: [PATCH] 'o' < 'p'. 2000-11-15 Robert Brady * modules/input/iminuktitut.c (inuktitut_compose_seqs): 'o' < 'p'. * gtk/gtkmain.c: s/CODSET/CODESET/, include for bind_textdomain_codeset. (gtk_init_check): Make the warning about translating default:LTR sterner. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-0 | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-2 | 12 ++++++++++++ ChangeLog.pre-2-4 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ gtk/gtkmain.c | 11 +++++++++-- modules/input/iminuktitut.c | 2 +- 9 files changed, 94 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 956403aae0..e3218278db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-11-15 Robert Brady + + * modules/input/iminuktitut.c (inuktitut_compose_seqs): + 'o' < 'p'. + + * gtk/gtkmain.c: s/CODSET/CODESET/, include for + bind_textdomain_codeset. + + (gtk_init_check): Make the warning about translating default:LTR + sterner. + Wed Nov 15 18:39:40 2000 Owen Taylor * **/Makefile.am : remove unecessary rules for win32-specific @@ -44,6 +55,7 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington +>>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 956403aae0..e3218278db 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +2000-11-15 Robert Brady + + * modules/input/iminuktitut.c (inuktitut_compose_seqs): + 'o' < 'p'. + + * gtk/gtkmain.c: s/CODSET/CODESET/, include for + bind_textdomain_codeset. + + (gtk_init_check): Make the warning about translating default:LTR + sterner. + Wed Nov 15 18:39:40 2000 Owen Taylor * **/Makefile.am : remove unecessary rules for win32-specific @@ -44,6 +55,7 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington +>>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 956403aae0..e3218278db 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2000-11-15 Robert Brady + + * modules/input/iminuktitut.c (inuktitut_compose_seqs): + 'o' < 'p'. + + * gtk/gtkmain.c: s/CODSET/CODESET/, include for + bind_textdomain_codeset. + + (gtk_init_check): Make the warning about translating default:LTR + sterner. + Wed Nov 15 18:39:40 2000 Owen Taylor * **/Makefile.am : remove unecessary rules for win32-specific @@ -44,6 +55,7 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington +>>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 956403aae0..e3218278db 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +2000-11-15 Robert Brady + + * modules/input/iminuktitut.c (inuktitut_compose_seqs): + 'o' < 'p'. + + * gtk/gtkmain.c: s/CODSET/CODESET/, include for + bind_textdomain_codeset. + + (gtk_init_check): Make the warning about translating default:LTR + sterner. + Wed Nov 15 18:39:40 2000 Owen Taylor * **/Makefile.am : remove unecessary rules for win32-specific @@ -44,6 +55,7 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington +>>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 956403aae0..e3218278db 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +2000-11-15 Robert Brady + + * modules/input/iminuktitut.c (inuktitut_compose_seqs): + 'o' < 'p'. + + * gtk/gtkmain.c: s/CODSET/CODESET/, include for + bind_textdomain_codeset. + + (gtk_init_check): Make the warning about translating default:LTR + sterner. + Wed Nov 15 18:39:40 2000 Owen Taylor * **/Makefile.am : remove unecessary rules for win32-specific @@ -44,6 +55,7 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington +>>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 956403aae0..e3218278db 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +2000-11-15 Robert Brady + + * modules/input/iminuktitut.c (inuktitut_compose_seqs): + 'o' < 'p'. + + * gtk/gtkmain.c: s/CODSET/CODESET/, include for + bind_textdomain_codeset. + + (gtk_init_check): Make the warning about translating default:LTR + sterner. + Wed Nov 15 18:39:40 2000 Owen Taylor * **/Makefile.am : remove unecessary rules for win32-specific @@ -44,6 +55,7 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington +>>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 956403aae0..e3218278db 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +2000-11-15 Robert Brady + + * modules/input/iminuktitut.c (inuktitut_compose_seqs): + 'o' < 'p'. + + * gtk/gtkmain.c: s/CODSET/CODESET/, include for + bind_textdomain_codeset. + + (gtk_init_check): Make the warning about translating default:LTR + sterner. + Wed Nov 15 18:39:40 2000 Owen Taylor * **/Makefile.am : remove unecessary rules for win32-specific @@ -44,6 +55,7 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington +>>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 9dde7c3ce9..fffe8b494c 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -29,6 +29,11 @@ #else #include #endif + +#ifdef HAVE_BIND_TEXTDOMAIN_CODESET +#include +#endif + #include #include #include @@ -395,7 +400,7 @@ gtk_init_check (int *argc, #ifdef ENABLE_NLS # ifndef G_OS_WIN32 bindtextdomain(GETTEXT_PACKAGE, GTK_LOCALEDIR); -# ifdef HAVE_BIND_TEXTDOMAIN_CODSET +# ifdef HAVE_BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); # endif # else /* !G_OS_WIN32 */ @@ -412,7 +417,9 @@ gtk_init_check (int *argc, { /* Translate to default:RTL if you want your widgets - * to be RTL, otherwise translate to default:LTR + * to be RTL, otherwise translate to default:LTR. + * Do *not* translate it to "predefinito:LTR", if it + * it isn't default:LTR or default:RTL it will not work */ char *e = _("default:LTR"); if (strcmp (e, "default:RTL")==0) { diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c index 066875e9bf..d86efff2cf 100644 --- a/modules/input/iminuktitut.c +++ b/modules/input/iminuktitut.c @@ -87,11 +87,11 @@ static guint16 inuktitut_compose_seqs[] = { SYL('l', 0x14d5, 0x14ea, 2) SYL('m', 0x14a5, 0x14bb, 2) SYL('n', 0x14c2, 0x14d0, 2) - SYL('p', 0x1431, 0x1449, 0) 'o', 0, 0, 0 , 0, 0x1405, /* as u */ 'o', 'o', 0, 0, 0, 0x1406, + SYL('p', 0x1431, 0x1449, 0) SYL('q', 0x157f, 0x1585, 3) SYL('r', 0x1546, 0x1550, 2) SYL('s', 0x14ef, 0x1505, 2) /* As h */ -- 2.30.2